* xterm.c: (x_draw_image_foreground, redo_mouse_highlight, XTmouse_position):

* xterm.c: (x_draw_image_foreground, redo_mouse_highlight, XTmouse_position):

(x_scroll_bar_report_motion, handle_one_xevent, x_draw_bar_cursor):
(x_error_catcher, x_connection_closed, x_error_handler):
(x_error_quitter, xembed_send_message, x_iconify_frame):
(my_log_handler): Rename locals to avoid shadowing.